From 940534af51390fad551562103b6ad929aa59691c Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Thu, 12 May 2011 09:13:18 +0100 Subject: [PATCH] x86: use compat hypercall handlers for calls from 32-bit HVM guests On 64-bit Xen, hypercalls from 32-bit HVM guests are handled as a special case, but not all the hypercalls are corrently redirected to their compat-mode wrappers. Use compat_* for xen_version, sched_op and set_timer_op for consistency. Signed-off-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 9 ++++++--- xen/include/xen/hypercall.h | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7cbdce3bed..b02be7b3ed 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2911,15 +2911,18 @@ static hvm_hypercall_t *hvm_hypercall64_table[NR_hypercalls] = { HYPERCALL(tmem_op) }; +#define COMPAT_CALL(x) \ + [ __HYPERVISOR_ ## x ] = (hvm_hypercall_t *) compat_ ## x + static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = { [ __HYPERVISOR_memory_op ] = (hvm_hypercall_t *)hvm_memory_op_compat32, [ __HYPERVISOR_grant_table_op ] = (hvm_hypercall_t *)hvm_grant_table_op_compat32, [ __HYPERVISOR_vcpu_op ] = (hvm_hypercall_t *)hvm_vcpu_op_compat32, [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op_compat32, - HYPERCALL(xen_version), + COMPAT_CALL(xen_version), HYPERCALL(event_channel_op), - HYPERCALL(sched_op), - HYPERCALL(set_timer_op), + COMPAT_CALL(sched_op), + COMPAT_CALL(set_timer_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), HYPERCALL(tmem_op) diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 3e1ada4bc9..40900a2001 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -146,6 +146,20 @@ compat_vcpu_op( extern int compat_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg); +extern int +compat_xen_version( + int cmd, + XEN_GUEST_HANDLE(void) arg); + +extern int +compat_sched_op( + int cmd, + XEN_GUEST_HANDLE(void) arg); + +extern int +compat_set_timer_op( + s_time_t timeout); + #endif #endif /* __XEN_HYPERCALL_H__ */ -- 2.30.2